Merge remote-tracking branch 'u-boot-sh/rmobile'

Conflicts:
	boards.cfg

Trivial conflict, maintainer change plus board addition

diff --cc boards.cfg
index dcc201479920da573a9a145a43900af2b018c70a,ca7719770e888f962cd6a949c55460dcc4d20597..7e84b9b7f1f9efeb9dc3dcab2a89f6fa73c7b900
--- 1/boards.cfg
--- 2/boards.cfg
+++ b/boards.cfg
@@@ -371,10 -367,8 +371,9 @@@ Active  arm         armv7          omap
  Active  arm         armv7          rmobile     atmark-techno   armadillo-800eva    armadillo-800eva                     -                                                                                                                                 Nobuhiro Iwamatsu <[email protected]>
  Active  arm         armv7          rmobile     kmc             kzm9g               kzm9g                                -                                                                                                                                 Nobuhiro Iwamatsu <[email protected]>:Tetsuyuki Kobayashi <[email protected]>
  Active  arm         armv7          rmobile     renesas         koelsch             koelsch                              -                                                                                                                                 Nobuhiro Iwamatsu <[email protected]>
- Active  arm         armv7          rmobile     renesas         koelsch             koelsch_nor                          koelsch:NORFLASH                                                                                                                  Nobuhiro Iwamatsu <[email protected]>
  Active  arm         armv7          rmobile     renesas         lager               lager                                -                                                                                                                                 Nobuhiro Iwamatsu <[email protected]>
 -Active  arm         armv7          s5pc1xx     samsung         goni                s5p_goni                             -                                                                                                                                 Mateusz Zalega <[email protected]>
 +Active  arm         armv7          rmobile     renesas         lager               lager_nor                            lager:NORFLASH                                                                                                                    Nobuhiro Iwamatsu <[email protected]>
 +Active  arm         armv7          s5pc1xx     samsung         goni                s5p_goni                             -                                                                                                                                 Przemyslaw Marczak <[email protected]>
  Active  arm         armv7          s5pc1xx     samsung         smdkc100            smdkc100                             -                                                                                                                                 Minkyu Kang <[email protected]>
  Active  arm         armv7          socfpga     altera          socfpga             socfpga_cyclone5                     -                                                                                                                                 -
  Active  arm         armv7          u8500       st-ericsson     snowball            snowball                             -                                                                                                                                 Mathieu Poirier <[email protected]>